* lisp/emacs-lisp/cl-lib.el: Require macroexp for its macros.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb16db306f13ce15adceb2124ce2fdc9d6f5fa13..3898c4e8c0a1df5599c4865f98d3975dfe641c1b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/cl-lib.el: Require macroexp for its macros.
+
 2012-06-30  Chong Yidong  <cyd@gnu.org>
 
        * xml.el: Implement XML parameter entities.

diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 51402f2e8aab082b10942638fe33596573a91877..8c83225ef3c07bb5ae81db047b292c362096fd32 100644 (file)
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -91,6 +91,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'macroexp))
+
 (defvar cl-optimize-speed 1)
 (defvar cl-optimize-safety 1)